From 7e77303ee5dc44594747e9c41688dd3273de7ea7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 10 Dec 2012 12:27:33 -0800 Subject: [PATCH] * configure.ac (HAVE_INOTIFY): Speed up configure-time test. There's no need to test for any of three inotify functions, since we use all three. Check for just the first one. --- ChangeLog | 6 ++++++ configure.ac | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5969d5726fb..a351872f545 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-12-10 Paul Eggert + + * configure.ac (HAVE_INOTIFY): Speed up configure-time test. + There's no need to test for any of three inotify functions, + since we use all three. Check for just the first one. + 2012-12-10 Daniel Colascione * configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32 diff --git a/configure.ac b/configure.ac index 6f188a54bd7..f721c02f71f 100644 --- a/configure.ac +++ b/configure.ac @@ -2187,15 +2187,14 @@ AC_SUBST(LIBGNUTLS_LIBS) AC_SUBST(LIBGNUTLS_CFLAGS) dnl inotify is only available on GNU/Linux. -HAVE_INOTIFY=no if test "${with_inotify}" = "yes"; then AC_CHECK_HEADERS(sys/inotify.h) if test "$ac_cv_header_sys_inotify_h" = yes ; then - AC_CHECK_FUNCS(inotify_init1 inotify_add_watch inotify_rm_watch, HAVE_INOTIFY=yes) + AC_CHECK_FUNC(inotify_init1) fi fi -if test "${HAVE_INOTIFY}" = "yes"; then - AC_DEFINE(HAVE_INOTIFY, [1], [Define to 1 to use inotify]) +if test "$ac_cv_func_inotify_init1" = yes; then + AC_DEFINE(HAVE_INOTIFY, 1, [Define to 1 to use inotify.]) fi dnl Do not put whitespace before the #include statements below. -- 2.30.2